Merge "Ignore embed-bitcode flag" am: 41be981f3c am: 51096a8d55

Original change: https://android-review.googlesource.com/c/platform/development/+/1412811

Change-Id: Ib62748656b70087c377156732c5c590e04c5eee4