Merge "Fixing studio build due to androidprv" into sc-v2-dev