Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f
am: 270657c8e7

* commit '270657c8e7d429a7f296c8d2789e7b16ff7ffdd8':

Change-Id: Ica8a7d1eddf7b2b0529160e9af9a39f21f744f8b