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

Change-Id: Id40657447ab138a851bac158a054fe6ade3f91a1