Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch

* remotes/quic/partner-android/jb-mr1-dev:
  chmod uga-x