Merge "Remove libcore implementation source from hiddenapi-mappings" am: 28c3ca2d41
am: 51a20be6ce

Change-Id: I65c12225468b8252802cbf0f430e3bda7a087ba8