Merge remote-tracking branch 'aosp/upstream-github'

Changes (2) :
aeb16e Adds root project and fixes some issues for local development.
c29248 Update configuration for missing plugin dep

Change-Id: If8ef735718de787fed7e6af3bf18284bbbf6708f