Snap for 4489466 from 001c26f7b43709f05e5739d11ccaf2500a0f2611 to studio-3.1-release

Change-Id: I97aedb46f4f0d83ca03e5b724b57893c812b61ad
tree: 810ec6324bcb8f63f7468efeb85ff7a756562737
  1. BUILD
  2. PREBUILT
  3. build.prop
  4. data/