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

Android 4.3 release 2.2

Conflicts:
	core/build_id.mk

Change-Id: I3ece87ff98efe8eddfbe97053c78963be1604eda