Merge "Track libcore.os' move to android.system."