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

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

Change-Id: Ie9c0475272b8ef13cec0e306761de8838f1d9e46