am 66eadc78: Merge "Move Android.mks to their parent dir." into klp-dev

* commit '66eadc7816eb4af781b0eafe377b92e4a46e95a2':
  Move Android.mks to their parent dir.