CleanSpec for clang 3.5

Change-Id: I301d2e56f013d7f9012372fd6c8c3995b88ea4a7
Merge "CleanSpec for clang 3.5"
Merge remote-tracking branch 'aosp/master' into fml-master