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

Change-Id: Id81e151e506fbdb469b69dbccb494040ba5256d9