Merge "Remove use of androidprv to work around a bug in sysyui studio build" into sc-dev