- Rename Android.mk as Android.mk.template for files under self-extractors folder. - Convert dumpstate/Android.mk to Android.bp Bug: 346457924 Test: m android.hardware.dumpstate@1.1-service.bramble Change-Id: Id3638d6f5125665f17e7d08ff51c295890676056