tf300t: Misc changes to make build work

Change-Id: I1865c81eac7b808d450b5994fd11accca0c59572
Merge "tf300t: Misc changes to make build work" into android-5.0