Added A file.

Change-Id: I768f5a16731a82e8c9de1201c82b502279699dff
removed a file

Change-Id: Ie44692672d03c2bd88636b1322bd35f08d0adfea
Merge commit '81dfaf0' into android-4.4
Merge upstream commits.