Merge "Remove old headers and libraries." am: dd39467272 am: e09a5a158d
am: b8794abb29

Change-Id: I821617c7c9ba3699d72936b6b8a51c547267b48d