Restore __ANDROID_API__ guards for camera/media headers
am: 6ae90b1c6e

Change-Id: Ib2d2432ce4d13aec015052bb3302a415da034517