Build: upgrade build tools to 21.0.2
Minor formatting correction for consistency
Implement the new Toolbar widget from appcompat-v7 r21