Merge "Move dvr_buffer_queue-test to use Android.mk"