Fix internal compiler error when compiling w/ arm-linux-androidabi-4.7

Change-Id: Ie2934704302bdfe3d982042173e05ba34dad3213
Omit some sketchy cflags when BONE_STOCK is defined

this should be a NO-OP when BONE_STOCK is not defined

Change-Id: Ic1474b4a87ad604bb44b0fbf74de82923c83039a