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

* commit '3e8ebad058d584623c003c32895f0f9416cd36c3':
  check if uid=0 before attempting remount