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: a884bb1d
Change-Id: I384a5a9a0cb3c9349cfea62e6633c88762b3ac14