[PATCH PM-QA v2 18/25] Android: Update makefiles with new test numbers