Merge "Camera: sort NDK getCameraIdList output" into pi-dev
am: 728f909a1f

Change-Id: I61daa8a5a2cc3d3db6145b26c0601c659db12cd7