DO NOT MERGE regenerate bp files for Camera 3.3 am: c6a1e863d6
am: 2470a68107  -s ours

Change-Id: I822f0e7151d9119bd8d432a3d31674a699411071