switch to master

Change-Id: I1ab8e6638500122b4aa6e4630dbf47182a894ca7
track a few staging branches

Change-Id: Ie3cfae4b19f29d0d99552a4aa79836fa22611a8f
track a few more staging branches

Change-Id: I980af5fb3cffcd450e20aa12b30ae0e56bb896bf
track local frameworks/compile/libbcc

Change-Id: If9957396bfd66485550cebb2d7bdccd6d28f3bb7
track staging of okhttp

Change-Id: I275d2998814c848a3b51099de08f06fb87864dba
track staging of nfc app

Change-Id: I3e05c79cc8b9525cb267e7419c7334a8b988ea1e
Merge branch 'jb-devel-mr2-release' into jb-devel-mr2-staging

Conflicts:
	default.xml

Change-Id: I73e211d77768b7d27de27c137ab0c1c18654f4c7
Merge branch 'jb-devel-mr2-release' into jb-devel-mr2-staging

Conflicts:
	default.xml

Change-Id: I086e43fb735d89fc03984ea80d81b148c4e58c9c
do not track superuser

Change-Id: I135e1ae6f3f3e20f976163def3d141ff0d01dbc1
fix duplicate expat

Change-Id: I8b1a3b569b4351ef6af5bac86e403302e9e68249
Merge remote-tracking branch 'origin/jb-devel-mr2-release' into jb-devel-mr2-staging
track staging of development

Change-Id: Iddcad3c8d44347ec2fa81e2415372875786d04a2