Snap for 4539464 from 61a139868eb14cc7d8bf65717b7be82aa09ad053 to studio-3.1-release

Change-Id: I0c6181ffdaa9f4465379cbdd8036a3ded9dfc470
tree: eee76f2a1c18b15173e2c1f93560db9465f053fb
  1. BUILD
  2. PREBUILT
  3. build.prop
  4. data/