am 4a605883: (-s ours) am d411d613: Merge "65xx: Minimally refactor Android.mk"

* commit '4a6058838e80addbeddb64f662b947291f1481c9':