Merge "Add jar files from the runtime APEX in the whitelist." am: 4d3a2f95c6
am: b5a3c59d3a

Change-Id: Iec1e66f533063cde4529a0f4d874418b4f01e0d6