Merge "Remove libm_hard." am: d5bc21cc0c
am: 1551b49c77

Change-Id: I74a83f2f69ffb80ae0eee050a1d183f26110809e