am 4115aeae: am 324c814c: Merge from AOSP

* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
  Add a hash-bang as the first line of a shell script