Merge "Add Android.mk as a dependency as well"
tree: 7b7e26304700ab773098af0f6abded47ce582ffe
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/