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

Change-Id: I60a05be9ee715275f4cf48c76c7183fb33541a28