Merge "make CtsJniTestCases instant app ready"
am: 380bf19ff9

Change-Id: I78f6353572c1ec8225c6c1665326c5d56b16c611