Snap for 4836502 from c589bdd09ebbb8e6b8bd312faa7e88e93601b45c to studio-3.2-release

Change-Id: Ic51d7ac750143ac53af6915ea8fc28ff9cfe30e2
tree: 24c844c8ce7437946f09c8bac3dc64b598b96274
  1. BUILD
  2. PREBUILT
  3. build.prop
  4. data/