84303f5cd6
Also remove the duplicate copy of this file. There's a redirect in place from the old location. Bug: http://code.google.com/p/android/issues/detail?id=41623 (cherry picked from commit 965da34de94cdb845b64bd676e45b260000cd09d) Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771