Snap for 6592931 from 342a33207b37059a355aa3eef04ddae011adca6e to studio-4.1-release

Change-Id: Ia5b70032e4d95822f267fa69d2bea27f3f877879
tree: 429f82f6de66593a807f28f466d365c9f593549e
  1. BUILD
  2. PREBUILT
  3. build.prop
  4. data/
  5. licenses/