[DO NOT MERGE] Fix SL4A Merge from Master

Change-Id: I44e7faaf5b9a0f3df348c5223a154044047e2526
1 file changed