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

Change-Id: If531aebdeb1c1af17b17579290651367f7f1cff8