Removes dependency on framework constants.

Bug: 11244110
Change-Id: I44bca3977c0740935c11b0dff7ef6397607c664a
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1