Merge "Convert libdvr tests to use Android.bp"