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

Change-Id: Ib286589fcdce770e476720eb1e78bb3322cf58f4