Merge pull request #3299 from t-nelson/pivos_android_generic_hw_queries