am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev

* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
  Update OTA to understand SELinux labels and capabilities