Merge "Clarify importing Android formatting conventions into Eclipse"