Android: Camera branch changed

Change-Id: I0d6360df04d280fad0d584e2a86dec487ef36190
defined local

Change-Id: I2b6cfd024fba33acc160acaf92fb96a5a0151495