Merge a8d9bc7073744cbd97c035113041fa583e5b1d2e on remote branch

Change-Id: Ic1866f2730310c472315d15f41798c7117ffee28
tree: 5d5d410f7513c2123916e5470ec834ee52cd6b38
  1. 1.2/
  2. Android.bp
  3. prop_pickup.bp