2.0.0-7

Align with upstream master branch (2.0.0-dev): apache@169877e, including

Android

• apache#340 to increase min file plugin version to 7.0, by @breautek