Merge "Remove emacs scripts"
am: 996f9b13a0

Change-Id: Ic55022dcaf960b1d81e745356edc14b3ad5b6f9c