DayDreamized : Please Cherry-pick this commit when resetting android_build