Merge changes from topic "am-c94c607f-8b6c-42d6-b9c8-4d95ded6329f"

* changes:
  [automerger] Sync jetpack and master Android.mk files. am: 7412f7ff1d
  Sync jetpack and master Android.mk files.