Snap for 5272482 from 98921a15c2ad4535b7e41d4ccf1eac09fa460cf4 to studio-3.4-release

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