Merge "Tests for libcore change d2aa1365d25911076cb174a04b1d5152f0ff80e3"
am: df04fda563

Change-Id: I96cd25375fb6690e4d464c8de3302b68051dcad0