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

Change-Id: Ic294ab2d1a995ee9b3238e5d6df7dea1a2a7289e