Snap for 6517240 from d6bd713fc74cc3899064c64f7d78fadb364cd588 to studio-4.1-release

Change-Id: I1e99d7db206d4bf7ad3bd971543ec4faedd9d203
tree: f20b44c4486f25bd9ba933f85b880890dd404788
  1. BUILD
  2. PREBUILT
  3. build.prop
  4. data/
  5. licenses/