Android R Preview 4 (RPP4.200409.015)
Merge "Convert LegacyCamera's Android.mk to Android.bp" am: b0841adc85 am: 88d9bc2fb3

Change-Id: I35d6188ed0748125ee2657831f973f084653a344