"JSS15K"
"JSS15L"
"JSS15M"
JSS15N
JSS15O
JSS15P
"JSS15Q"
Merge tag 'android-4.3_r2.2' into jellybean-mr2.1

Android 4.3 release 2.2

Conflicts:
	core/build_id.mk

Change-Id: Ie1164c431378597eee07591cc25403374264a1e3