Android 4.4 branches

Change-Id: Ice402e51709c615e779cc9e737b5f5559a7d8e42