reorder and add # Camera flags

Change-Id: I472ab74a4e65672951b709f0697ef60db1dc4cc7

Conflicts:
	BoardCommonConfig.mk