Merge "Convert core/tests/hdmitests/Android.mk file to Android.bp"