am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"

* commit '3178c83a02c7e0b1ee6f94c207f0d851f5baf7f2':
  check if uid=0 before attempting remount