Merge "Fix package name in android.rscpp" into lmp-dev