Merge "Temporarily exempt /system/lib[64]/bootstrap from CtsJniTestCases" am: 899f7de8ff
am: bcaee7c1a4

Change-Id: Ic128bf4e2c7c58a1c69fe4cd130a8dddf9cbcff6