Merge "Remove -Xno-hidden-api-check flag." am: 6177ead17f am: 640d5c5e05
am: 1a649c50ab

Change-Id: Id412f14d2d008e079ef71a46f88a150f2f9959f7