Merge "Track build rule name change in libcore" am: e9d7361d84 am: 4076ce57e4
am: 786bc8214e

Change-Id: I4368bd08ca69298d2d791eb9aed70df5db2f89ba