Remove legacy include files. See also: https://android-review.googlesource.com/152256 Bug: http://b/21471495 Change-Id: Ie17a5c890958ef769d1b4593e6d3c30195e12287 (cherry picked from commit 5ac097dfe9450c96112f8b57774029c661265d68)