Merge remote-tracking branch 'aosp/upstream' into master

3a17686 Merge remote-tracking branch 'aosp/upstream' into master
d4f49b07 Merge pull request #103 from colincross/parser
e32cc80f Refactor blueprint parser nodes to an interface
aedd4903 Merge pull request #101 from colincross/doc
79324963 Fix documentation property type for pointers
d9f6fd55 Remove naming stutter in bpdoc
017ed2e2 Fix govet issues

Change-Id: Ie0863b79ee0d22ae6dbc066ca06303f046d904b7