Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a

Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: Icf463dd2214ed720d1c9eba7a8b8461a19c3659c