Android: Camera branch changed

Change-Id: I0d6360df04d280fad0d584e2a86dec487ef36190