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

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

Change-Id: I4653808dcbf1701eae49c5238d746e6dd60cf4a5