Merge 3595f360d4c9eb43db378ec3bc2d689aff2d031e on remote branch

Change-Id: Ifb4690478697b4eb93e7737cbf5a49b7b60de2d5
tree: 90c93ca528a04310c833187c873e29aba919237f
  1. 1.0/
  2. 1.1/
  3. 2.0/
  4. nxpnfclegacy/
  5. Android.bp
  6. current.txt
  7. prop_pickup.bp