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

Change-Id: I9308eff29946c2d219c5af198a6e63eef19b0e2b