am 44c116d5: am 682a27cb: Merge "Fix root inode security labeling issue."

# By Robert Craig
# Via Android Git Automerger (1) and others
* commit '44c116d55f59b6b4839747620e0c6cd299f8e9f8':
  Fix root inode security labeling issue.