goldfish: sync arm mk file with aosp to avoid merge conflict Change-Id: I06d6be4f25e3f0a83235dffe424353b8c1df6613