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

* commit '27ece5e7ee754bb3842e02ce7121c71ba1e6d8f1':

Change-Id: Ic74887cf6a23c3d20d5bc0713f35e33b67c4f00f