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

Change-Id: I5a2ccca8b0687419f403c7748fb687ffd332f33c