Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148
Fix issue #7503920: Log spew from vold

Change-Id: Ibfa5b979014f433085b94aab0d3d81bf9269d4b5
Merge tag 'android-4.2.2_r1' into jellybean

Android 4.2.2 release 1