Revert"upstream android 4.4.2_r2 into build! "