merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I1e5f377e655f72b8d2e497e83cf4207f5b786e01
Lazy parsing of zip files for Java resources.

Central directories of zip files should be read lazily.
They are needed only to service calls to
BaseDexClassLoader#findResouce(s). Most android processes
don't use these methods since they use android resources.

bug:6797061

Change-Id: I1a5b5d03572601707e1fb1fd4424c1ae2fd2217d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Fix compilation of Enum on JDK 7

Change-Id: I2e58b6a527e4ef1fc7ed3359b8aea88d01a031fb
Merge tag 'android-4.2.2_r1' into jb422

Android 4.2.2 release 1