Merge "Add Dolby cflags to policy_hal/Android.mk"