Merge "RESTRICT AUTOMERGE: Camera NDK: Hide keys for the rotate-and-crop...
Merge "RESTRICT AUTOMERGE: Camera NDK: Hide keys for the rotate-and-crop controls" into rvc-dev am: 192831ab am: e839912a
Change-Id: I54202e9ec3726213ea81640438c0a20d63d1c7b2