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

Change-Id: Idc86680d8cb723239d4f046a1a6faa05370fada4