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

Change-Id: I92398dd72f406934f15126f5893612898204bc90