Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am: 2a8c24be18 am: 6dea42ae0f
am: 2a21a9c997  -s ours

Change-Id: I36d988ae251bcee837a0f3ab7630fd82d099adc8