am c291ed4b: am 538e8032: Merge "Add missing restorecon_recursive calls."

* commit 'c291ed4b0f7f4d4551c4060399a840ea9f8c1259':
  Add missing restorecon_recursive calls.