Merge "media_ndk_headers: Add host support" am: fdb9d30635 am: 860ff23f3f am: 2ec8242316 am: 35c5578efb

Change-Id: I0bc29c68d5182dee5f9fd751cef31f3f3461357e