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

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

Change-Id: Iaab029e6b836a5e7bfcacedb37934596cc298e20