[PATCH PM-QA 4/4] Android: Update makefiles with new test numbers