Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
am: 661cbb7f1b  -s ours

Change-Id: Iddc4eb1f1a90dda1020c4d9a7375c2b4d8dcfdc6