am 77784cb9: Merge "Add Android*.mk files to additional dependencies"

* commit '77784cb9b7bad354601a3f965c3eaffecf6798ca':
  Add Android*.mk files to additional dependencies