Merge "Remove emacs scripts" am: 996f9b13a0
am: ddf9c9bbeb

Change-Id: Ic83e157c4a730e09094cc8e815e6d1198d75f04b