Merge "Clean up no_libgcc" am: 5a24316391 am: b206812186 am: 5ead3cdc08
am: 4835973c99

Change-Id: I23f3fd6cec973c0745d431ea63f55739b86dc817