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

Change-Id: Idec5c4fbaeb072014db1004726e2e9f94e4a704b