Merge "Convert to Android.bp; Android.mk cleanup"