Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212 am: 91bb8ea67e
am: 55327c1a62

Change-Id: I35afb8777a41a3cfadb22e99b8e459b9ccd2520f